d/rules,d/p/03: Fix DATADIC path, closes #913304

diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index acbcec1352ce13bf548da53be6974b70b2b1e271..f550c8857961438ce509a2b32b8c467c3e98e84c 100644 (file)
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -54,8 +54,8 @@ Author: Mathieu Malaterre <malat@debian.org>
 -install(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data)
 +set(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}")
 +
-+install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
-+install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
++install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${CMAKE_INSTALL_DATADIR} COMPONENT data)
++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIC} COMPONENT data)
  
  # add paths to the dictionaries to a CMake variable for being used by the unit tests
  set(DCMTK_DICOM_DICTIONARIES

diff --git a/debian/rules b/debian/rules
index 9452ba0c6ec0e78989627563d3532d16741cef5c..5b999b3ebcc1ae1fc015c100df27d4657d88c7cd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_ICONV:BOOL=ON \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk14 \
+ -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk14 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF \
  -DDCMTK_USE_CXX11_STL:BOOL=ON \
  -DDCMTK_ENABLE_CXX11:BOOL=ON